update gradle wrapper and android plugin versions
Refactor api for clarity