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

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

Change-Id: I8202f5de8d08fcf337c8a842c289f857ebfa172c