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