Merge "Update build-tools to ab/6450980" am: 22197a5f am: a531137e am: fe753d17 am: 31c79b11 Change-Id: I598747c77d99974d638fc68bd9bf2be5215ed48b