Merge latest patches from upstream am: fdad07cb6e am: 771b6d93c6 am: 6c1bd82791 am: 20ab3e76e3

Original change: https://android-review.googlesource.com/c/platform/external/libchrome-gestures/+/2480579

Change-Id: I3dc2841504dc340f8091c70f05dae81cfc1a85bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>