Merge "Add NATIVE_WINDOW_SET_SURFACE_DAMAGE"