Merge "cm: Add CMScreenshot to builds" into gingerbread