Temp fix when no gold linker

Change-Id: Ic7a576b86c1380725454cfee500d34ef9852eafb