Merge "Update build-tools to ab/5224175" am: fa51f02990 am: 0e5f3ded14
am: 13ba9ce68b

Change-Id: I5548d495cfd437d53d220a2eb75ff8f26a1b8976