Merge "Move linker config under /linkerconfig" am: 597eca8a8c am: 5b4162c464 am: 6b7774f06e

Change-Id: Ibcbf9ff0b6489e25ec238091b7d9ab5a925a7cc3