jflteatt: de-commonize loki

Change-Id: I6aaabb2f87858936d7ef9581a722dac41d139a48