Merge "BpfMap - make clear() multithread safe" am: e9e8305a36

Change-Id: I28b535422944cff241f52fcf29351e52d09b66c7