Merge "retire android_native_window_t"