am f8bf4acb: am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere

* commit 'f8bf4acb505d8058e75b8b6f19738ee2c9a4322e':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere