Add aries to device names. CWM Recovery requires device name aries
Merge branch 'fix_cmw_flashing' into cm-12.0