Get //tools/base/repository/... passing

Change-Id: I36d88885462644490c27accbb7a7d4ab40890a6f
12 files changed