Merge remote-tracking branch 'PA/kitkat' into kitkat-remix
Merge remote-tracking branch 'PA/kitkat' into kitkat-remix

Conflicts:
	packages/SystemUI/res/values/pa_strings.xml
Merge remote-tracking branch 'base/kitkat-remix' into remix-legacy

Conflicts:
	core/res/res/values/pa_strings.xml