Merge "Fix linker path for emulated architecture"
am: 05dbd9653b

Change-Id: Ia3044c18960ee362f5bde4909b5a02bf7d4c0698