am 045b7d1a: am e2c89788: am b512e0a3: (-s ours) am 0ea1da27: am 5f126c0d: am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part of fix for libmedia OOB write anywhere" into lmp-dev
* commit '045b7d1a':
DO NOT MERGE Part of fix for libmedia OOB write anywhere