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