Update with gradle and Android Studio support. General clean-up