(1 of x) Bugfixes in build

Change-Id: I285b5a89848f521d57697349af8ce177a9b8a93a

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java