Update to latest SDK Build Tools
Merge branch 'master' of https://github.com/nicolasjafelle/AndroidDemo