Merge "build: add hwservicemanager to the core packages"