Add OC and simple gov into msm2
GPU: Enable Simple gov & Fix Compile Issue