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

Change-Id: Iecb2133a510b0d6cbf18d2b11b6c18d8b9d014a9