Fixing issues with android studio 0.6

Upgrading the build tool and android plugin to their latest versions