Merge "Cleanup in StubLibraries.bp" am: 6b36fba388 am: e53ade169f

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

Change-Id: Ia10c84a6030143d1fe41937933e466e17fd978d4