Update bpf test for type safety
am: 162826e9b4

Change-Id: I8347bd151eb8820a703f464a314923dc3053068d