am 5f126c0d: am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part of fix for libmedia OOB write anywhere" into lmp-dev

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