Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_frameworks_native into cm-12.0