am 030d058c: am 7a4cfed7: am 49cfd200: am 35fbcdd6: am 3d97de8c: am b8a84e59: am ef87594b: Merge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-dev

* commit '030d058cb18fa70b3584dfd2e1e6a8b31b26f2dc':
  libstagefright: Fix crash in convertMetaDataToMessage