Update linkerconfig up to date am: ac298bb8b9
am: 5f70da9b82

Change-Id: I90ac221bf3afc2e8ad50be9eb28eaec87ec23ff8