Proper linker order

Change-Id: I8ca025a386e833b5f023753aa702214136675f21