Fixed android gradle plugin version
Merge branch 'master' into API10