Merge "libstagefright is no longer 32 bit only."