deleted doubled lib
nfc lib included
Merge remote-tracking branch 'refs/remotes/android.git/master' into public-master

Conflicts:
	GQ_Android/project.properties