Merge "Remove ld.config.recovery.txt build" am: 5bc7941be3 am: da084f96a5 am: 54e6a991e0

Change-Id: Iadb9bb2c18484c963834c839902bbbf6d0a07d06