Apply required lollipop changes

Conflicts:
	META-INF/com/google/android/updater-script
Cleanup