Merge "apf: adjust JNI to accept_packet()'s new signature"