Merge "Build stub libraries with smaller deps" am: 68d17855ea am: 88c2c1aa6f am: 1ed5aad300 am: e13d2abfb9

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

Change-Id: I67a32bec2322109d0465bf00f9575f6cf47f66b9