Upgrade build tools for Lollipop
Merge pull request #56 from CircleBinder/upgrade-build-tools

Upgrade build tools for Lollipop