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

Change-Id: I5e62fcbf6c8cba6eec2c0f13c9d7c244e5b563aa