Fixup some compilation errors (overlays)

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