m7: improve common proprietary file handling

Device-specific proprietary files, device-specific but commonly named
proprietary files, and common proprietary files are now handled.