Upgrade to build tools 21.1.0