Fold opposite values for OR and XOR into -1 am: 31d96b5c37 am: b092315dd2

Original change: https://android-review.googlesource.com/c/platform/art/+/2984874

Change-Id: I83075580e292f52fcde811c6d7461a64cf395fc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>