Import build tools from build 6297618 am: 758fae28d7 am: c3c429ca4c

Change-Id: I52bc1f10abbe7734dc4d98f74329fb79d74ac679