Merge "Simplify *.map.txt for API levels <= 21." into main am: 23adf82ad2

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

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