Update build-tools to ab/6234825 am: fbdf0a6d9f

Change-Id: I916d85eb42e356cface4b234c2cee5fda3233358