Merge "Bugfix: fix the build for CONFIG_FP_MB_STATS" into nextgenv2