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

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

Change-Id: I6129238aec45f9ef479aefba34c24c39c7d90a78