Merge remote-tracking branch 'legacy/kitkat' into kitkat

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java