Reverted build tool version to 21.0.1