Revert "Switch Bullhead to HWC2on1Adapter"

This reverts commit d482c4c025b56bb9996471ccda7af90168f8f0a3.

Change-Id: Ida6c20e7c051fb738423c9349ae4e1200de7d9ae
diff --git a/BoardConfig.mk b/BoardConfig.mk
index b3c276c..88507cb 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -85,8 +85,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