target,project: msm8996: Change to detect VB on runtime

Change to enable detection of VB on runtime, and load appropriate
binaries.

Change-Id: Ic8ab5341b7cb61447210bd14494cb9abc3100e07
diff --git a/project/msm8996.mk b/project/msm8996.mk
index aa9fb8e..b6f7603 100644
--- a/project/msm8996.mk
+++ b/project/msm8996.mk
@@ -21,7 +21,6 @@
 ENABLE_QGIC3 := 1
 ENABLE_SECAPP_LOADER := 1
 ENABLE_PARTIAL_GOODS_SUPPORT := 1
-ENABLE_RPMB_SUPPORT := 1
 ENABLE_GLINK_SUPPORT := 1
 ENABLE_PWM_SUPPORT := true
 ENABLE_LPAE_SUPPORT := 1
@@ -54,6 +53,7 @@
 ifeq ($(VERIFIED_BOOT),1)
 #enable fbcon display menu
 ENABLE_FBCON_DISPLAY_MSG := 1
+ENABLE_RPMB_SUPPORT := 1
 endif
 
 ifeq ($(ENABLE_FBCON_DISPLAY_MSG),1)