Merge "Remove the ILP32 __arch_swab cruft." into main am: 28cea75371 am: 2239d2de24

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3386019

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