Update build-tools to ab/4140685 am: 66cc0d305e  -s ours
am: 703584fddd  -s ours

Change-Id: I858106141507b89b6487b37c1b22404b6f81e51d