am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix crash in...
am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
* commit 'f814f84e':
DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage