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

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