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

Conflicts:
	src/com/android/settings/AOSPAL/AdditionalSettings.java
	src/com/android/settings/SecuritySettings.java