LPS-48581 Turn build-service into a macrodef, no logic changes

This reverts commit 180c951175ea66043c8dcb7b48eca67d43153a71.
LPS-48581 Make it so an OSGi plugin can easily call the macro

This reverts commit ca9ececdf72a93b96969426dcd5c973f5b1c1b3b.