Fix linking issues.

Change-Id: I26e414faa7c880f6787da126753ebdcb7ed38b2f
Merge topic 'linking-woes' into master

f5a13fc4 Fix linking issues.