am c1447241: (-s ours) am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
* commit 'c14472413260a6b233282a6ff3acb58b6571ab5c': DO NOT MERGE Part of fix for libmedia OOB write anywhere
This commit is contained in: