Merge from Cyanogenmod/android_frameworks_native:cm-12.0
Utilizing CM-12 for fw/n for time being as base. should be no conflict issues in merge