Merge various clean-ups from upstream am: 6ec93b19a1 am: 3b1cf4abca

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

Change-Id: Idd7d71c077125a479c3032f3ecd703977466b535
Signed-off-by: Automerger Merge Worker <[email protected]>