Update build-tools to ab/6110188
am: 8457d31951

Change-Id: I82822183deb33eb22da22965ce4e0b9d6dce97d4