Update build-tools to ab/6267243 am: 6210d080b5 am: 5c68d4e8e9

Change-Id: Ib9c5a23a53c97b38acfde129873d1e6601ffe328