Update build-tools to ab/6267243 am: 6210d080b5

Change-Id: I789673f9ee7e96929137e75efc50fabd62504335