Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_packages_apps_Nfc into cr-main-10.2