Update build-tools to ab/4524985 am: 7ec2be6859
am: 9dcd3c19ec

Change-Id: I40b2fbe7332a3ebdc445e63d06e329c972600d08