FS#330 - Merge "old-droids" and "new-droids" branches

Android Studio / Gradle support the use of build “flavors” with different code, plus Android apps support versioned resources, so the two branches can be merged into a single one taking advantage of that.