Reverted some minor things, added drm.cfg in propriety-files.txt

Change-Id: I50378febfded21ce8f4905509a4f122e73ed2f7a