Merge "Update build-tools to ab/5661346"
am: 590d785237

Change-Id: I86b6df04eca5b5b41d2afde676cfa37845dd378d