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

Change-Id: I914641ecdd638fda4c2cd3a3b8a890481d57ed95