Use build-extras.gradle instead of build.gradle
Merge branch 'master' into plugin_with_arm_binary (gradle changes)