Update build-tools to ab/4030172 am: de6ba97efb
am: 11895fd248

Change-Id: I3089ccb424907417ca13e245ae0acc73f444af81