Merge "Update build-tools to ab/6001388" am: 3f851483cd
am: 1cdad15019

Change-Id: Id255abc5e4aa49200c03f3786aeaa9e3e05f4eae