Update build-tools to ab/4534650 am: 2212d17cf2 am: 5c59667b2e
am: ecf33dc2fd

Change-Id: I6d0b601d774cb98a2776b8791b6d54489b5c7b16