Merge "Hardcode package/class to switch between camera and camcorder." into gingerbread