Merge branch cm-12.0 from cyanogenmod into l-experimental
Emptied branch previously to start a fresh base from cyanogenmod for testing, all files are direct from CM-12