Merge "More precise 32-bit only for libstagefright/ subdirectories"