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

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

Change-Id: I9e438e107e5d505ac8bbe89501d774aedb3c04a5