Merge "Update build tools version to 21.1.0. DO NOT MERGE." into lmp-dev