Fix the loki product name

When the module and the target are different, installation is keyed to
the name, not the final stem

Change-Id: I86881ffb34b5ca217d8e6c1cb92c195ff36ce864
Merge branch 'cm-11.0' into kk_mkt