relocate TARGET_SCREEN_{WIDTH,HEIGHT}

Change-Id: I7ba0d9a78b318ce0352b3a59fa5d69ad409e2313

Conflicts:
	cm.mk