Merge 086658c87748ba97586361ec803b5ac1064ece82 on remote branch

Change-Id: Iccb89ed6f1ab8d12a9c39cd30a81de2efd5b328b
diff --git a/vendor_product.mk b/vendor_product.mk
index b611d91..03a73f3 100644
--- a/vendor_product.mk
+++ b/vendor_product.mk
@@ -11,7 +11,7 @@
   PRODUCT_PACKAGES += android.hardware.usb@1.2-service-qti
 endif
 
-ifneq ($(filter taro kalama,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter taro kalama neo,$(TARGET_BOARD_PLATFORM)),)
   PRODUCT_PROPERTY_OVERRIDES += vendor.usb.use_gadget_hal=1
   PRODUCT_PACKAGES += android.hardware.usb.gadget@1.1-service-qti
   PRODUCT_PACKAGES += usb_compositions.conf
@@ -29,7 +29,7 @@
 PRODUCT_PROPERTY_OVERRIDES += vendor.usb.dpl.inst.name=dpl
 
 # QDSS uses SW path on these targets
-ifneq ($(filter lahaina taro parrot,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter lahaina taro parrot neo,$(TARGET_BOARD_PLATFORM)),)
   PRODUCT_PROPERTY_OVERRIDES += vendor.usb.qdss.inst.name=qdss_sw
 else
   PRODUCT_PROPERTY_OVERRIDES += vendor.usb.qdss.inst.name=qdss