Update build-tools to ab/5325013
am: 1a33bf5ec2

Change-Id: Id085c529e75c3572ee97891b2efee9764384f55e