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

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

Change-Id: I04b1eb672b5f0c6afc277094ce431b4378b297f1