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

Conflicts:
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java