Merge "Add NATIVE_WINDOW_ENABLE_FRAME_TIMESTAMPS"