Merge "Revert "Add GESTURE_{X,Y}_OFFSET axes to input HAL""