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

Change-Id: Ica41934dc0a6da58f40f8ce87ae618ed1e0e5878