Merge "Dist merged jar instead of monolithic one" am: 7350b62384 am: e39d2d9f8c am: cd873a8792 am: 0760665ae2

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

Change-Id: Ib2598301fce47c845953a66d8a74d78a2b1bcd5d