Merge "FP2-1575: libstagefright: Fix crash in convertMetaDataToMess" into fp2-dev-v2