aries-common: fix device encryption

LVM /dev/mapper/* devices need to be manually labelled

Change-Id: I6e6c765890974c33fe841007764dfe97078811df
Merge "aries-common: fix device encryption" into cm-11.0
Merge branch 'cm-11.0' into martincz