Merge "Move linker config under /linkerconfig"
am: 597eca8a8c

Change-Id: I88bf213b85759f2716012e9967924cf0febb1297