Stylus gestures features (2/2)

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java

Change-Id: If4fa001a124874b3264ea1980e846e1ab9de50e8

Conflicts:
	res/values/arrays.xml