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

Merge "[automerger skipped] Merge "Add RBE_CXX_COMPARE variable to locally disable compare mode for C++" into rvc-dev am: f65ffea1 am: de90e238 -s ours" into rvc-d1-dev-plus-aosp am: 4f01e8e8 -s ours

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

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

Change-Id: I6a3f91372618e9dc8575dd34b67e1be6db9a4804