Merge branch 'jb4.2' of git://github.com/SlimRoms/packages_apps_Nfc into jb4.xx

Conflicts:
	nxp/jni/com_android_nfc_NativeNfcManager.cpp
	nxp/jni/com_android_nfc_NativeNfcTag.cpp
	src/com/android/nfc/handover/HandoverTransfer.java

'Merge'