am a7d36c18: Merge "libstagefright: Fix crash in convertMetaDataToMessage" into mnc-dev

* commit 'a7d36c184562cc15b2d665ff25c485fefdcfbabd':
  libstagefright: Fix crash in convertMetaDataToMessage