Build fixes

Signed-off-by: PipelinerArd <kristoferard@gmail.com>

Conflicts:
	core/java/android/provider/Settings.java