Fix libraries in the embedded case
@bug W-2367659@
@rev gtorres@
Merging origin/jgoodman/master-pending-libembed into master