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

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

Change-Id: Ie05c629ad2ba24517954bd4722e6a3b7e1546e7a