Revert "Switch Angler to HWC2on1Adapter"

This reverts commit ed617d8a13539ccf1c0e71e5dd38fa0412fb0444.

Change-Id: Iea60e1abc2498e0dd2637aa7c515c3d237c51d0e
(cherry picked from commit abcccadc248163ff81ad2b7c372f096f4894cf05)
diff --git a/BoardConfig.mk b/BoardConfig.mk
index f24512c..b7830f9 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -67,8 +67,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
 
 HAVE_ADRENO_SOURCE:= false