Update to build tools 21.1