mGerrit: Add missing files; fix build

Change-Id: I05a838b1629009d66de3d1b71b49093c222f5d4e