Merge "ld.config: Permit legacy /system/vendor paths"