Revert "Make bullhead use HWC2to1Adapter in surface flinger"

This reverts commit 129aa03c8dcc6ffec222e91d07e33f30784e750b.

Change-Id: I675f9d8c4ce8e9e8aaf9b126000fdfd4477969d2
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 96d646d..6c2a540 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -86,8 +86,6 @@
 TARGET_USES_ION := true
 TARGET_USES_C2D_COMPOSITION := true
 TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS := true
-TARGET_USES_HWC2 := true
-TARGET_USES_HWC2ON1ADAPTER := true
 MAX_VIRTUAL_DISPLAY_DIMENSION := 2048
 
 TARGET_AUX_OS_VARIANT_LIST := bullhead