Reapply "Update bpf test for type safety"
am: 44ad5cbf69

Change-Id: I376688601ad3460cc68a3ad10246ece5a65e4138