Update build-tools to ab/5212025
am: e0e7636307

Change-Id: Ia8da3852df186c4ae699ea224cbc23cb8038b406