Merge tag 'android-4.2.2_r1' into mr1.1-staging

Android 4.2.2 release 1

Conflicts:
	core/java/android/os/Trace.java
	core/java/android/widget/Toast.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java