Merge "Allow display device config files in VENDOR directory."