More BUILD fixes and 3rdparty/jvm normalization.