switched to merged android_build