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

* commit '0e3758333de98de24b8cbb2f05fc1b53e182aa9e':