proprietary-files: Commonize msm8960 and msm8960dt where possible

Change-Id: Iddfdb65e5d3f2fbed7eb4d2d65e6a4c3f55eda69
Disable lpa.decode to fix headset playback on msm8960

Change-Id: If1d8139293fe20cb34c80a08df272884e6d02168
Remove unused nfc hal

Change-Id: I7eab5c9e5408a8596f920e3266bb68a16f8794e6
Revert "Remove unused nfc hal"

 Leave this here for devices that will use the 3.0 kernel

This reverts commit 14a35e5b43a09c3919fa3878374cda0f11977d19.
Merge remote-tracking branch 'upstream/cm-11.0' into berserk