Merge "Re-submit "Make sdk depend on merged srcjar instead of monolith"" am: 2686ccd91a am: b85906517b am: a20cfcbae3 am: 3e998cedbc

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

Change-Id: I20ae1dd0f6804ea6496cf431c691d75d115d5670