Update build-tools to ab/4845314
am: dfe8f28075

Change-Id: Ie962d50ebb705f4907baf74989858c39b5ce503b