[automerger skipped] Merge "Cleanup in StubLibraries.bp" am: 6b36fba3 am:...

[automerger skipped] Merge "Cleanup in StubLibraries.bp" am: 6b36fba3 am: e53ade16 am: a4d7651b am: fcfc2ee4 -s ours

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

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

Change-Id: Iad7ef369285c611919f07eb47dee1c8899f1e5bd