resolve merge conflicts of 00046ad to nyc-mr1-dev-plus-aosp

Change-Id: I9540ecace4b20e8931fdf591e2d6604caf194f4c

diff --cc core/Makefile
index 8c01656,b69d9d9..facdc79
--- 1/core/Makefile
--- 2/core/Makefile
+++ b/core/Makefile
@@@ -535,13 -516,7 +535,13 @@@ VERITY_KEYID := veritykeyid=id:`openss
  endif
  endif
  
- BOARD_KERNEL_CMDLINE := $(strip $(BOARD_KERNEL_CMDLINE) $(VERITY_KEYID))
 +ifeq ($(BOARD_BVB_ENABLE),true)
 +BOARD_KERNEL_CMDLINE := $(strip $(BOARD_KERNEL_CMDLINE))
 +ifdef BOARD_KERNEL_CMDLINE
 +  INTERNAL_BVBTOOL_MAKE_BOOT_IMAGE_ARGS += --kernel_cmdline "$(BOARD_KERNEL_CMDLINE)"
 +endif
 +else
+ BOARD_KERNEL_CMDLINE := $(strip $(BOARD_KERNEL_CMDLINE) buildvariant=$(TARGET_BUILD_VARIANT) $(VERITY_KEYID))
  ifdef BOARD_KERNEL_CMDLINE
  INTERNAL_BOOTIMAGE_ARGS += --cmdline "$(BOARD_KERNEL_CMDLINE)"
  endif