more cm/crdroid merges