Bring hammerhead inline with new build system

Change-Id: I040d3fdf5f3c273c553182f040945a55808a6941