Fix problems with phases (inczip and android-armv7)
Include the android-arm libraries by default as well (so we can unit test on older versions of Android - which only have arm emulators, not armv7)