Omnirom Gerrit!

We don't do CM any more, so fix this to work with Omni.