Update build-tools to ab/6166604 am: 5794e96eb8

Change-Id: I5bf294fd2873d343618b0ba743da0cb07541aa84