am 40ec6c3a: am df31e36a: Merge "MediaCodec: consider usage bits when changing...
am 40ec6c3a: am df31e36a: Merge "MediaCodec: consider usage bits when changing surface." into mnc-dev
* commit '40ec6c3a':
MediaCodec: consider usage bits when changing surface.