Update build-tools to ab/6131042
am: 78ae13f38c

Change-Id: I00315b4999660afed0ec1bdcbec5aa84b9b753c8