Update build tools to 21.0.2

Update to the latest build tools to pull in latest fixes