Merge "apf: adjust JNI to accept_packet()'s new signature" am: 786150bc09
am: 6b9e31d7eb

Change-Id: I1674ac22f00af037ad415a4436b94b2eec6a02b7