merge branch cm-12.0 of cyanogenmod into l-experimental
previous empty commit to ensure minimal conflicts for new base