Merge "Fix compiler warning when CONFIG_ACCOUNTING enabled." into nextgenv2