Merge branch 'cm-12.0' of https://github.com/ArchiDroid/android_hardware_samsung into cm-12.0