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

Change-Id: I226d53c3dee63bd57293bbb9011d984e20fe9b99