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