Fix forceHighEndGfx property to override isHighEndGfx

Change-Id: I3fac164c5a555d8f9e1416f82ed33596fff64ac5

Conflicts:
	res/values/custom_strings.xml
	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java