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

* commit '49cfd20030d335356e350f6417c690af7f175ea7':
  libstagefright: Fix crash in convertMetaDataToMessage