Lots of BUILD fixes.

3rdparty/jvm partial normalization.
Some missed merge bits.