Back to AOSP Tag package

(now handling empty NDEF from the Nfc package)

Change-Id: I2dd2b0420ff8f555326231f2e3b638f2e579b493