Update build-tools to ab/6416774

https://ci.android.com/builds/branches/aosp-build-tools/grid?head=6416774&tail=6416774

Bug: 153821749
Bug: 154114625
Test: treehugger
Change-Id: Ibcfb2d8af857bb7948429d6848b401d389ab1cbb
49 files changed