am 2cfcaf48: am 1d82220a: Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev am: 0e3758333d
am: fb1f9993a7

* commit 'fb1f9993a742d0f8a46cba7e795f66324d57a334':