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
aries-common: enable KSM by default

Was enabled by default by Google for crespo

Change-Id: I0951eeed152020e684e9e9e7aa17bac05120d044
Merge remote-tracking branch 'cm/cm-11.0' into kitkat