Update build-tools to ab/6007012 am: 19b5ca7be3
am: 5877fdd3f7

Change-Id: I10598dffa0a12076c8f0577771e5d6e6b6ad253a