Merge \\"Revert \\"Rename libevent-host to libevent\\"\\" am: 79498a069a
am: d136a4d7f2

Change-Id: Id95887948cdcbf7d5cdf9bd9ec3ae78f3f5b1108