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

* commit '3d97de8c77b214d865a52fb1a36541d6359b2872':
  libstagefright: Fix crash in convertMetaDataToMessage