Merge "Update build-tools to ab/6001388" am: 3f851483cd am: 1cdad15019
am: 1f05b50ee1

Change-Id: I029f1adbd3a447cef8641f57ec44dd6c731868fe