[automerger skipped] Merge "Cleanup in StubLibraries.bp" am: 6b36fba388 am: e53ade169f am: a4d7651ba3 am: fcfc2ee438 -s ours

am skip reason: Change-Id Ide93b0f6076fec733f5a01b7fccbf280d5a8d0f6 with SHA-1 2feb3f1369 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1500051

Change-Id: Iad7ef369285c611919f07eb47dee1c8899f1e5bd