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

* commit '94f4c803949778a594c1bbe64bf64a31a5fd3a71':
  Update build tools version to 21.1.0. DO NOT MERGE.