Update build-tools to ab/5285575
am: f6b81f5d86

Change-Id: I376f35250d872cfb269b112f7d9a81b60618cab7