Merge "Update to new BuildToolInfo API."