Standardize and use device-proprietary-files

Change-Id: I4f84631fad217e9e9c541beb2d55c91583fbee29