Merge "olympus: move CMParts overlay back to device tree" into gingerbread