Merge "Reapply "replace platform netbpfload binary with a symlink to apex"" into main