am a47ba501: (-s ours) am 2bc7c211: am 03dfa603: am cd572c00: am 4ea9bca1: Update build tools to 22.0.1. DO NOT MERGE.

* commit 'a47ba5013917c20fd8b7da4ae13fdfb01ae7541f':