am cac7b2b1: Merge "Update stylus button press recognition in GestureDetector...
am cac7b2b1: Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev
* commit 'cac7b2b1':
Update stylus button press recognition in GestureDetector to use new APIs