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

Change-Id: Ib863965b9280a16846d18e4e066a1a6e422d34f5