custom domx/libion naming changes

Change-Id: I1b67a0e3ce1f61ca671f011e0cbc5cbaf0543fe0
Merge remote-tracking branch 'origin/jb-mr1' into cm-10.1