Lots of BUILD fixes.

3rdparty/jvm partial normalization.
Some missed merge bits.
More BUILD fixes.
Fixup last compilation and test errors.