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

Change-Id: Ic810c889b1110e94e86736834a4676153c52519c