Merge changes from topic 'hwc-hal'

* changes:
  graphics: add a default implementation for IComposer
  graphics: add HIDL definition for HW composer
diff --git a/nfc/1.0/vts/Nfc.vts b/nfc/1.0/vts/Nfc.vts
index 1f50698..8c18653 100644
--- a/nfc/1.0/vts/Nfc.vts
+++ b/nfc/1.0/vts/Nfc.vts
@@ -1,6 +1,7 @@
 component_class: HAL_HIDL
 component_type_version: 1.0
 component_name: "INfc"
+component_type: NFC
 
 package: "android.hardware.nfc"
 
diff --git a/nfc/1.0/vts/NfcClientCallback.vts b/nfc/1.0/vts/NfcClientCallback.vts
index e2a3e5b..e468935 100644
--- a/nfc/1.0/vts/NfcClientCallback.vts
+++ b/nfc/1.0/vts/NfcClientCallback.vts
@@ -1,6 +1,7 @@
 component_class: HAL_HIDL
 component_type_version: 1.0
 component_name: "INfcClientCallback"
+component_type: NFC
 
 package: "android.hardware.nfc"
 
diff --git a/nfc/1.0/vts/types.vts b/nfc/1.0/vts/types.vts
index 969a8af..f56ddf1 100644
--- a/nfc/1.0/vts/types.vts
+++ b/nfc/1.0/vts/types.vts
@@ -1,6 +1,7 @@
 component_class: HAL_HIDL
 component_type_version: 1.0
 component_name: "types"
+component_type: NFC
 
 package: "android.hardware.nfc"