Merge "Add detailed kernel version when checking bpf support" am: 7dacd1b72a
am: d61ee6c7d8

Change-Id: I6fadae189d21ad20b7a1e158a8b68df80e6a9763