Enable stylus gestures

Re-enable stylus gestures, since it has now been merged into 10.1

Change-Id: I5330e11fcf7fb86c37581012e35ce18d17b4dc86
quincy: UMS is deprecated

 * UMS is buggy and deprecated. Disable it.

Change-Id: I32f9e1138c2aa55ebfe10a4acc96dfd20502b295
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1