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

* commit '7a4cfed77b138db03bc79fc6ef2be83db7d1831b':
  libstagefright: Fix crash in convertMetaDataToMessage