Merge "support bpf_map_def struct size increase to fix map uid != AID_ROOT"