Merge "libc.map.txt: remove the two riscv64 special cases." into main am: e400d03b7e

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

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