Merge "Fix potential ApfFilter bugs by careful ByteBuffer use" into nyc-dev
am: 10d70bf

* commit '10d70bff61af5b9c88ce2a3124b2ffbc3a3424fb':
  Fix potential ApfFilter bugs by careful ByteBuffer use

Change-Id: Ia2819f1b8fb3e6cd2f728647eba13e978ea30a94