Update build-tools to ab/3050982 am: 5a966750a5 am: 1b9bea742e
am: 2a513ca027

Change-Id: If7216bedc8cbc59d71adb017912fe40219e019c9