Merge "stagefright: handle NULL format after convertMetaDataToMessage am: 5bd99f9211 am: 775226f35d" into nyc-mr1-dev-plus-aosp