Fix building
Merge branch 'lego' of https://github.com/LEGO-ROM/android_frameworks_base into lego

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java