bump(build-37): Update scripts to fix random build failures

Change-Id: Iee76592d621a8390797e010cf2061706f1844342