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

Change-Id: Id662cade30e7cd1136a2a4d0694e4c4f25b176c2