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