Update build-tools to ab/5909951
am: f0f1b2cba0

Change-Id: I4cc8dd410ea4b7631096352fe6553f29f07c8766