am 6ef58be7: Merge from AOSP

# By Chih-Wei Huang
# Via Chih-Wei Huang (1) and others
* commit '6ef58be7db451bb911c8f41b0ab5aa33d5defb18':
  Remove unnecessary lines in PRODUCT_PACKAGES
diff --git a/device.mk b/device.mk
index 8b28d80..32e78f0 100644
--- a/device.mk
+++ b/device.mk
@@ -102,8 +102,6 @@
 
 # NFC
 PRODUCT_PACKAGES += \
-        libnfc \
-        libnfc_jni \
         Nfc \
         Tag