Update build tool to 21.1.1