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

* commit '80dbd2a7f277e2fcf831e2ac1b2da574e1513564':
  Fix build error in init when building with bootchart