m7-common: improve common proprietary file handling

Change-Id: Idc8eca69e87fa873dfdd3d21e35a9b6ba9ea16ae