Merge "bpfmap: Move to Common Location"