Merge "Update build-tools to ab/4925842"