Merge "Always use ensure_start to ensure goma\'s daemon runs" am: f221cbb
am: 75b1a39

* commit '75b1a3945c6df5c79017a5a85291a02f0eb78549':
  Always use ensure_start to ensure goma's daemon runs

Change-Id: I77a95ce9fdb30d5205fb6552d0b1d745faaedb22