Build 26 and some build.gradle fixes.