Reflect changes made in android_build