[automerger skipped] Update build-tools to ab/6732571 skipped: 83a260014c

Change-Id: I98f6360ffc7ae32e508d18a3ed6609595292515e