Merge "Revert "Add hw/kelvin to top level build system.""