am 432ed3d6: Merge "libstagefright: fix 64-bit warnings"

* commit '432ed3d66d09464778df31c73374ee897f7b8840':
  libstagefright: fix 64-bit warnings