am 2bc7c211: am 03dfa603: am cd572c00: am 4ea9bca1: Update build tools to 22.0.1. DO NOT MERGE.

* commit '2bc7c21179ebdb30ced37459c006a55042a9fef3':