Merge "Fix signature for MotionEvent#setButtonState"