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

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

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