We need to be able to link both into one binary in the
disable-dynloading case.

Change-Id: I499e204dfef2af488d4a350cb3a5bcfc03ca887f