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

Change-Id: I812215f01513b1f6ef1c6adb3aa8268bfc9afacf