Update build-tools to ab/5227581
am: 0f3889605d

Change-Id: Iaf9143833de95932eca4e3fb3836538b83389b95