am 212282c3: am 80dbd2a7: Merge "Fix build error in init when building with bootchart"

* commit '212282c314265b1d1def070634049c55291576bb':
  Fix build error in init when building with bootchart