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

Change-Id: I4c22ba4d7f054e33d39cef15a9b9a071700ba621