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

* commit '35fbcdd63b3961e98797a738c138698a8bcf4258':
  libstagefright: Fix crash in convertMetaDataToMessage