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