Fix forceHighEndGfx property to override isHighEndGfx

Change-Id: I3fac164c5a555d8f9e1416f82ed33596fff64ac5
Merge branch 'du44' of https://github.com/DirtyUnicorns-KitKat/packages_apps_Settings into HEAD

Conflicts:
	res/values/custom_strings.xml