am 0bf47426: am af9e6a17: Merge "Properly connect/disconnect to/from the...
am 0bf47426: am af9e6a17: Merge "Properly connect/disconnect to/from the native window in MediaCodec." into jb-dev
* commit '0bf47426':
Properly connect/disconnect to/from the native window in MediaCodec.