remove duplicate entries from proprietary-files.txt

Change-Id: Ib0e3eb41813af757a660d99a7af1927f54eac1c8
Fix typo

Change-Id: Ifee4df83da9b1abd6f2cf7e5f8dee27085a60263
Merge branch 'cm-11.0' into stable/cm-11.0