Merge "defconfig: Disable OCMEM on msm8610"