android: merge android_surface with android_window