Update build-tools to ab/5310534
am: bfb860908f

Change-Id: Ia7dded6582d20494665971e94d498a51f6b4fdf0