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

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