Merge "Install ld.config.recovery.txt to $(TARGET_RECOVERY_ROOT_OUT)/system/etc." am: 7cbebb2ba0
am: 8d2a5e9015

Change-Id: Id31c24876ca8d77304e338a0d288956c0c0c0001