Update build-tools to ab/6097364
am: f0db4145e1

Change-Id: Iafb8ce6bef72889a19ee9f676870b4ef8e694d96