Update to latest build tools version 21.0.1