Merge "Revert "Make sdk depend on merged srcjar instead of monolith"" am: 56c15a5e02 am: 908089e9a0 am: 5fb00b3c80 am: 3d69a2a8f6

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

Change-Id: I0cf35ea08103dd608d38a3bc462a521c2bab7baa