Merge "Modify any lines with libc.so!libc.so to libc.so." am: d6ba6d2400

Original change: https://android-review.googlesource.com/c/platform/development/+/2089004

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