Merge "Revert "Make sdk depend on merged srcjar instead of monolith"" am: 56c15a5e02

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

Change-Id: Ic44462483265f74772fcae572036adc20ef37d77