Update build-tools to ab/5310534

Test: treehugger
Change-Id: Id93f9aa582fe9ff720ae8e1844bc7eeff7f99ee4
20 files changed