A number of unit tests needed to be told where to find their libraries
and matching headers.
(cherry picked from commit 24d420f20b)
A number of unit tests needed to be told where to find their libraries
and matching headers.
(cherry picked from commit 24d420f20b)