Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
n7100: telephony things
Remove symbols
Enable NFC
Merge branch 'cm-10.1' of git://github.com/ParanoidAndroid/android_device_samsung_n7100 into pa-mr1