Update to use bauner/android_build