Update build-tools to ab/5254092
am: f6502431a1

Change-Id: I8876630cacdb206a06c4b17079209d172062816b