am 39515ddc: am 47b90fe2: (-s ours) am b69a01a5: am 07a2e912: am 323d22e7: am 8319fadb: am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage

* commit '39515ddcc04096824889eac8125ec3527230c3eb':
  DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage