b2ghack-798491: Catchup with moz-central change
b2ghack-798491: Catchup with moz-central change

The idea of the change was to reduce number of system compartments in
B2G main process

Signed-off-by: Joe Walker <7a17872fbb32c7d760c9a16ee3076daead11efcf@mozilla.com>

joewalker/gcli,mozilla/gcli,mozilla/gcli,mozilla/gcli,joewalker/gcli