More changes to make Gradle build.  About 90% of the way there, only thing not working now is Google APIs (i.e., Maps API v1).