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

* commit '1770d4bdca62a1798aaa83618cc78450020162bf':
  Update build tools version to 21.1.0. DO NOT MERGE.