ADT to Android Studios (Gradle)

Attempting to move to Android Studios and this requires some changes,
will work in this branch until conversion is complete and buildable