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

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