Switch to Google Common MSM Kernel