Revert "Unembed mGerrit from ROMControl"

This reverts commit 66401751e9682d7967e7efe5fa1349c1fc1ae6a7.

Change-Id: I34192b55ea7f8b11d82f2ddb78fec685c9f9c545
Merge "Revert "Unembed mGerrit from ROMControl"" into jb-mr2