am 4ea9bca1: (-s ours) Update build tools to 22.0.1. DO NOT MERGE.
automerge: f847fe0  -s ours

* commit 'f847fe047b370ef294302ba7680621f4448e47cd':
  Update build tools to 22.0.1. DO NOT MERGE.