am 098b28fc: am 64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories"

* commit '098b28fc88b3d96eada2f9db318d9c38c70cf674':
  More precise 32-bit only for libstagefright/ subdirectories