Update versions to latest
Merge branch 'master' into anlu-devel
Depend against Android Studio local module