Update build-tools to ab/6123254
am: c3c27f36f8

Change-Id: Ifadef5de6afddc24dccc602290c16f9ce643b18f