Update build-tools to ab/3725807 am: f08dad472e
am: ef321317dd

Change-Id: I33950e4e5ddf16f00e9beeefa689d03b05b40e3a