Merge "Add /system/vendor/{lib|lib64} to linker args"