am 6bf90ce0: am cee546e5: (-s ours) am bcf3a11f: am e5d4a0be: DO NOT MERGE Part of fix for libmedia OOB write anywhere
* commit '6bf90ce0aed049ea6c2aec6085417fb6e234d3b6': DO NOT MERGE Part of fix for libmedia OOB write anywhere
This commit is contained in: