heroc: some cleanup and fixups for Evervolv

Change-Id: Ib55e15f5f666c0d0c5fab93df4b2ed898b199db8
17 files changed