Update build-tools to ab/6060597
am: 8e64bf63a2

Change-Id: I88fcfa78c121d7e87835c0bd073fedde3c090e01