am 9f013a46: am 3c89a2e9: Merge "camera3: Don\'t try to disconnect stream...

am 9f013a46: am 3c89a2e9: Merge "camera3: Don\'t try to disconnect stream native windows more than once" into jb-mr2-dev

* commit '9f013a46':
  camera3: Don't try to disconnect stream native windows more than once