Merge "Fix ApfTest and apf_jni to make it match the latest design of ApfV6" into main