Revert "loganre: Enable proximity wake option"
* Sometimes it doesn't work, and it seems to cause various
  issues for some people.
Merge branch 'cm-11.0' of github.com:kostoulhs/android_device_samsung_loganreltexx into cm-11.0
Add back couple of missing lines in media_codecs.xml

Change-Id: Ibb06ec5f90c4d82266846ed89e1c0dd93944d566