Update build tools for Android Studio 1.0.
Simplify implementation.