am fec8f588: am 4b6a2d71: Merge "stagefright: measure max encoder buffer count...
am fec8f588: am 4b6a2d71: Merge "stagefright: measure max encoder buffer count for persistent surface" into mnc-dev
* commit 'fec8f588':
stagefright: measure max encoder buffer count for persistent surface