Add OC and simple gov into msm2
GPU: Fixing Compiling Issue