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

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