Merge "stagefright: measure max encoder buffer count for persistent surface" into mnc-dev