switch back to CM device_common, gps changes now in device repo