Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: Iee612ad0f443d5ae9fa9e469785f304394b3d40c
Change-Id: I818641fdaf6ec330c97bbd202c526a0862db6862

core/rbe.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,12 @@ ifneq ($(filter-out false,$(USE_RBE)),)
		cxx_compare := false
		endif

		ifdef RBE_CXX_COMPARE
		cxx_compare := $(RBE_CXX_COMPARE)
		else
		cxx_compare := "false"
		endif

		ifdef RBE_JAVAC_EXEC_STRATEGY
		javac_exec_strategy := $(RBE_JAVAC_EXEC_STRATEGY)
		else