Update build-tools to ab/6507196 am: 717e4b1db9

Change-Id: I5d7f453c685a35ba0306a2562a8c1a25d20972ca