Revert "Merge "Make sdk depend on merged srcjar instead of monolith" am: a368dc8c05 am: 442f44b125 am: ae2ddf04aa am: b24684d2c0" This reverts commit fac369b86c90e1f15694129fc0e67f4dabf1ceb0. Reason for revert: b/172663078 Same as aosp/1490698 to accelerate fixing the build without waiting for the automerger. Bug: 169034951 Bug: 172663078 Change-Id: I7a7f642b20f8c2563f6569cd716d86468b6f7e07