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

Change-Id: Ib712e8fd1398bf8764ab875ea2eff8a356f285cb