jfltevzw: de-commonize loki

Change-Id: Ieacd6e57657512bb18457890dac93a264f642f9c

Conflicts:
	BoardConfig.mk
	device.mk