Merge "Re-submit "Make sdk depend on merged srcjar instead of monolith"" am: 2686ccd91a am: b85906517b

Original change: https://android-review.googlesource.com/c/platform/development/+/1492878

Change-Id: I5ee6b3bd3ece62697bcaa6d0938aefde36fd9efc