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

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/pie/PieHelper.java
	packages/SystemUI/src/com/android/systemui/statusbar/pie/PieMenu.java