fix build: bad insertion with 4.2.2 merge
a couple more build fixes
fix build again
remove duplicates
fix build
ugh

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
fix notification manager
derp