Merge "Remove unused -DXP_UNIX." into main am: 7015b5abd1

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3128498

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