Build fixes (Still not ready)

Change-Id: I0e9b15ed8833223bf66aeaa7171a4903d1bef6d7
Signed-off-by: Evan Anderson <evan1124@gmail.com>

Conflicts:
	services/java/com/android/server/NotificationManagerService.java
	services/java/com/android/server/am/ActivityManagerService.java
	services/java/com/android/server/pm/Settings.java