Updated gradle, build-tools and Android versions.
Further demonstrates flavors, now by two different manifests.