Update build-tools to ab/5319091
am: c1cfd27370

Change-Id: I498af6b8eea5d03d4c1295b0a6bbc7f312be349a