Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_device_lge_g3-common into HEAD

Change-Id: I5c349bd10f4869cd232fd694eb172222635b90f9
g3: clean up media_codecs.xml

Change-Id: Ie672bba34b5c6858120431a6bf903c1594eeaca3