AROMA: Add support for kernel + recovery combo (Xperia M)
build.sh: misc