am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere

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