Minor tweaks to  build.gradle to make things work