Remove unused monolithic jars

Nothing depends on these. They were only here for easy comparison
with the merged variant while we ironed out diffs.

Rename the merged variants instead of having duplicate compilation
rules.

Bug: 171029603
Test: m nothing
Change-Id: I7859589b93b861439fb1b7de084e52294da53671
Merged-In: I7859589b93b861439fb1b7de084e52294da53671