Add Android.mk, switch to square/wire