Apply required lollipop changes

Conflicts:
	META-INF/com/google/android/updater-script
Cleanup
Merge branch 'master-cm' of https://github.com/ArchiDroid/ArchiDroid into i9300-cm-experimental