am d9f0be89: (-s ours) am d1884052: am bfadec12: am 25c00122: am 4ce86e78: am...

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

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