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

Change-Id: I0a3cc532cb6203f2a4b098906f238ab81e465b7c