Update build-tools to ab/4629474 am: ec4e9f97f5 am: d2d2929607
am: e74215a80b

Change-Id: Ifdf2a5c7d0697d0ec77c551974c7fc5263b65462