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

Change-Id: I60d2cfb4dc83c35820457f4f1b7646a01acf4edd