Merge "Add NATIVE_WINDOW_GET_COMPOSITOR_TIMING"