4.2.2 fixes round 2

booting and working

Change-Id: Ic75cb738fafc301d22a0c4cec8b71a749962cf89
SysUI crash: Keybuttonview

Change-Id: I22a95244d2aa4942ce74950f8b2e5b2887e203f3
Merge remote-tracking branch 'AOSPA/jellybean' into jellybean
merge cleanups