Update zjr for new bootstrapper
Switch to mach for build-android