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

* commit '6bb7a89102a8966ee032d6ddc0b3ff4f1a47ef66':
  libstagefright: fix 64-bit warnings