Improve logic in is_android_build