Update build-tools to ab/4629474
am: ec4e9f97f5

Change-Id: I87c25a4aaa7551774444a2fbed00fea7a507b993