Merge "Fix build error in init when building with bootchart"