[automerger skipped] Separate x86 and non-x86 code targets am: 9af2cb856f -s ours am: e4cdb2aaaa -s ours

am skip reason: skipped by takise

Original change: https://android-review.googlesource.com/c/platform/external/pciutils/+/3228767

Change-Id: Ic8dc9dc706570555d21bcb68497247c0ad4dd62b
Signed-off-by: Automerger Merge Worker <[email protected]>