Revert "build: Realign product libraries with corresponding applications"

This reverts commit 3837c35b2896a79ef8604e7e89427e6b1ecb32f1.