Merge "change to ro.kernel.ebpf.supported property" am: fa1f620449

Change-Id: I47a6d30af20f06de70c8383265f343f1e3a0700a