Merge "Part of fix for libmedia OOB write anywhere" into mnc-dev