am 25c00122: am 4ce86e78: am 5d7a381b: am 877c76ac: Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev

* commit '25c00122a640ee311e6e72df401c362ec798617d':
  stagefright: check IMemory::pointer() before using the allocation