Merge changes Id4ca8ef7,I1021c590

* changes:
  implement connect/disconnect in our native_window_t implementations
  Add a new connect/disconnect API to android_native_window_t