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

Change-Id: I7f806ea42119c31512af84e4efa3f14069ccffcd