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

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

Change-Id: Id2dfc04bed0b8420eb9b882e83492087b9642fa6