MREVERT: erge branch 'android-4.4' of git://github.com/omnirom/android_packages_apps_OmniGears into jey

Conflicts:
	res/layout/dialog_color_picker.xml
	res/values/custom_dimens.xml
	res/values/custom_strings.xml (reverted from commit f233876015e376e9806dafc40f51e37379c8eba5)