gradle: Write sub-project list explicitly to make Android Studio happy
gradle: Have project's build.gradle look for a build-extras.gradle
gradle: Fix warning about dynamic properties being deprecated
Merge branch 'master' into 4.0.x (gradle Android Studio)