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

Change-Id: Iacc863f17ab40a829cbef33655e7fd0f3458319d