am e2abaffe: am 3cef9257: Merge "Part of fix for libmedia OOB write anywhere" into mnc-dev

* commit 'e2abaffefc0170f36d27b171fa8af0fd290fb794':
  Part of fix for libmedia OOB write anywhere