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

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

Change-Id: I0126b9f12df21f63f800e21953b5991004e1bad7