Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev