NFC API revision round 2.

- Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag,
  RawTagConnection, NdefTagConnection.
- Add implementations for all of the new NFC API.

Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6
Signed-off-by: Nick Pelly <npelly@google.com>
diff --git a/Android.mk b/Android.mk
index 6dc39eb..ad637dc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -159,14 +159,6 @@
 	core/java/com/android/internal/view/IInputMethodClient.aidl \
 	core/java/com/android/internal/view/IInputMethodManager.aidl \
 	core/java/com/android/internal/view/IInputMethodSession.aidl \
-	core/java/com/trustedlogic/trustednfc/android/ILlcpConnectionlessSocket.aidl \
-	core/java/com/trustedlogic/trustednfc/android/ILlcpServiceSocket.aidl \
-	core/java/com/trustedlogic/trustednfc/android/ILlcpSocket.aidl \
-	core/java/com/trustedlogic/trustednfc/android/INdefTag.aidl \
-	core/java/com/trustedlogic/trustednfc/android/INfcManager.aidl \
-	core/java/com/trustedlogic/trustednfc/android/INfcTag.aidl \
-	core/java/com/trustedlogic/trustednfc/android/IP2pInitiator.aidl \
-	core/java/com/trustedlogic/trustednfc/android/IP2pTarget.aidl \
 	location/java/android/location/IGeocodeProvider.aidl \
 	location/java/android/location/IGpsStatusListener.aidl \
 	location/java/android/location/IGpsStatusProvider.aidl \
@@ -249,6 +241,10 @@
 	frameworks/base/core/java/android/content/res/Configuration.aidl \
 	frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \
 	frameworks/base/core/java/android/net/Uri.aidl \
+	frameworks/base/core/java/android/nfc/NdefMessage.aidl \
+	frameworks/base/core/java/android/nfc/NdefRecord.aidl \
+	frameworks/base/core/java/android/nfc/Tag.aidl \
+	frameworks/base/core/java/android/nfc/NdefTag.aidl \
 	frameworks/base/core/java/android/os/Bundle.aidl \
 	frameworks/base/core/java/android/os/DropBoxManager.aidl \
 	frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \