Update build-tools to ab/4564837 am: 6a83ae30f4
am: 0fdfe42654

Change-Id: I41c0524b700ddb2968839096f2516a201633093b