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

Change-Id: Ib4297c9af5338803a88bab6e60717c7e997057ce