Better IPv4 multicast coverage in ApfTest
am: 961ca49fd6

Change-Id: I3a39484b463c6902b3fb3a05303c5b97d60b89fd