NFC refactoring

Change-Id: Id239eae364b7e1eddc512acb3516be1c62a726d1
Merge branch 'cm-10.1' of github.com:CyanogenMod/android_hardware_samsung into HEAD