Merge "Merge "stagefright: handle NULL format after convertMetaDataToMessage" into nyc-mr1-dev am: 15223ec262 am: 88f651ba62" into nyc-mr1-dev-plus-aosp