Merge changes I5391fedf,I4b49f2c0,I91fd81f5 into main

* changes:
  APFv6.1: addTransmitL4() optimizations
  APFv6.1: addTransmitWithoutChecksum()
  Add JBSPTRMATCH support to APFv6.1 generator and ApfFilter

src/android/net/apf/ApfV61GeneratorBase.java

diff --git a/src/android/net/apf/ApfV61GeneratorBase.java b/src/android/net/apf/ApfV61GeneratorBase.java
index 464b16e..014d893 100644
--- a/src/android/net/apf/ApfV61GeneratorBase.java
+++ b/src/android/net/apf/ApfV61GeneratorBase.java
@@ -203,7 +203,7 @@
 
     @Override
     public Type addAllocate(int size) {
-        final int imm = (int) Math.ceil(Math.max(0, size - 266) / 8.0);
+        final int imm = (size > 266) ? (size - 266 + 7) / 8 : 0;
         return append(new Instruction(Opcodes.ALLOC_XMIT, Rbit1).addUnsigned(imm));
     }