am 7a0c1949: am cc1a4208: am 3662ca10: Merge "StagefrightMetadataRetriever: handle error returned from convertMetaDataToMessage()." into mnc-dev
* commit '7a0c1949':
StagefrightMetadataRetriever: handle error returned from convertMetaDataToMessage().