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

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