TEMPORARY: Fixes for bringup with old sauce

Change-Id: Iba8b827d52506df933598ec831044f27cef0ab97
Revert "TEMPORARY: Fixes for bringup with old sauce"

This reverts commit bd38c6693ee4a6409350e11ec6e6f9c430b2ef72.
TEMP: Disable missing CM feature references

Change-Id: Id47edbe4c852976afb2e23ae88e6976fa5f6e2da
Merge remote-tracking branch 'cm/cm-12.0' into HEAD

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

Change-Id: Iac10a80ff6b8305f977d1bacf2f8b0141070ca6a