am bf7560f1: Merge "Further refactoring of the bootchart code."

* commit 'bf7560f12c6c2ca81a6648bd59bba5024dcd24fe':
  Further refactoring of the bootchart code.