Disable HWC2to1 adapter due to crashes in AUPT

Change-Id: I82a1e1742b54abfb1af640b2aabffbf1c764f8fb
(cherry picked from commit ae09f66d2001338c029b7566945b4dd44087b4f9)
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 391bf19..2190818 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -49,8 +49,6 @@
 TARGET_RECOVERY_PIXEL_FORMAT := BGRA_8888
 
 PRESENT_TIME_OFFSET_FROM_VSYNC_NS := 0
-TARGET_USES_HWC2 := true
-TARGET_USES_HWC2ON1ADAPTER := true
 VSYNC_EVENT_PHASE_OFFSET_NS := 7500000
 SF_VSYNC_EVENT_PHASE_OFFSET_NS := 5000000