am 1d8f0cd6: am 770b78bd: am 683790ae: Merge "init: Fix bootchart trigger for emulator"

* commit '1d8f0cd667ce19b0324035fb9ad08c912f89d642':
  init: Fix bootchart trigger for emulator