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

Change-Id: I8c901931db53258ef7868d8e65c33f12a8d51307