Merge "Do not execute linkerconfig from recovery"
am: b12e54c4f1

Change-Id: Ica8a524984cc85a05c23a03133693586cb7e4f80