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