Merge "Explicitly list the static libs for exclude-libs flag." am: b3f0aab0 am: 0b0b629b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2227218



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