Merge "Migrate BpfInterfaceMapUpdater from U32 to S32"