Merge "Add golden output of linkerconfig" am: 2c87cccfbd am: a1eed93a5c

Change-Id: I3c7f498a6bc16a04604587a686ebe28ccccb3716