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

* commit 'af9e6a17d7038b411b61a3cb0669694058511a05':
  Properly connect/disconnect to/from the native window in MediaCodec.