Merge "Make sdk depend on merged srcjar instead of monolith" am: a368dc8c05 am: 442f44b125

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

Change-Id: I1bb4e3a09927f29ac7b435f5a96b85e5366413fa