Fix build w/ latest greatest build repo

Change-Id: I8537bfc7e660a411a29cb7369e799ffc525d6189