config.xml: use d2-common config.xml
Merge branch 'cm-11.0' into kitkat