Merge "/vendor/lib/hw is removed from search paths for vendor default ns"