Update build-tools to ab/5310534 am: bfb860908f
am: e0f2cccfa0

Change-Id: I6572dd1b88866368b02d7abe7f5b39ba489b69a7