merge branch cm-12.0 from cyanogenmod into l-experimental
previous empty commit to ensure all files clean for new testing branch