Revert "Build Fixes"

This reverts commit 9d79dfbb5539fa170deab88ec44dcf3a6f28b4c0.

Conflicts:
	core/res/res/values/cm_strings.xml