Updated to Gradle 1.11
Migrated unit tests instrumentTest->androidTest

This is to match with the changes from android gradle 0.9