Merge "Add linkerconfig into dumpstate" am: 0373c65ccc am: 685bd276e5

Change-Id: I6a2d18b23bb2547d5b0ea17227704898448a3182