87922237
* commit '87922237de893b92c7b4d252999dd91d04470bd0': DO NOT MERGE Part of fix for libmedia OOB write anywhere