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

Change-Id: I81185267dd82450e4522984418ee283c2b5e4b71