Merge "Update build-tools to ab/9088018"