c1447241
693f0813
87922237
* commit 'c14472413260a6b233282a6ff3acb58b6571ab5c': DO NOT MERGE Part of fix for libmedia OOB write anywhere