misc

Conflicts:
	META-INF/com/google/android/aroma-config