[automerger skipped] Merge "Add RBE_CXX_COMPARE variable to locally disable...

[automerger skipped] Merge "Add RBE_CXX_COMPARE variable to locally disable compare mode for C++" into rvc-dev am: f65ffea1 -s ours am: 88904fd3 -s ours

am skip reason: Change-Id Ia972c74d804085196a7b6ec755af63042c6b3909 with SHA-1 b0f055db is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11637205

Change-Id: I3602ff6c6a33927b9643f6a664f04c87d2f25a48