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

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

Change-Id: I57af0d64742ddf4585cfcc036f53244e0c2d6226