Merge "ld.config: Permit legacy /system/vendor paths" am: 6521bf3c98
am: 7334915cf5

Change-Id: Ib3fb0c3311d66df5e06d2484889211cac97d2f34