Fixes mismatch for Java APIs between HC and VPP and L2 pkgs