Update build-tools to ab/5310534 am: bfb860908f am: e0f2cccfa0
am: a8fbf6c05b

Change-Id: I2684109eee668032ee8d09001897793285157613