Merge remote-tracking branch 'cm/cm-12.0' into HEAD

Conflicts:
	g2.mk
	overlay/frameworks/base/core/res/res/values/config.xml

Change-Id: Icc95989bea6b1e44d48088c24bf54005009e3727
Audio Update: After recent audio changes, FIX issues which arose,
hangout dialer ONE of a few... and some other audio & media issues.

Change-Id: I4f4d9809e9cabd8dc671c551d3404f19ee809ff0