AROMA: Add support for kernel + recovery combo (Xperia M)

Conflicts:
	META-INF/com/google/android/aroma-config
build.sh: misc