am 17d47a10: am 5193f245: Merge "Update build tools version to 21.1.0. DO NOT MERGE." into lmp-dev

* commit '17d47a107210b5e9566cdc2b0b9b177919a59560':
  Update build tools version to 21.1.0. DO NOT MERGE.