Merge "Fix remounting /vendor"