Update build-tools to ab/3652165 am: ff39700ae0
am: a62e8486b7

Change-Id: Ic9215c7f6b83e8cbc458a5603b4011a2326925fd