ToUpstream: Various backend improvements
App Settings 1.7.1
Devil kernel 2.2.5

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
Devil Kernel 2.2.5b

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt