update config for 1.22.1, add F2FS volume_id support

Change-Id: I5a80246222448c238ef48a0eb6d906f011f3f43d
touch -h: quickfix for bionic

Change-Id: I7821c039214bad2741baeb9177d31e22495583d8
Merge remote-tracking branch 'cm/cm-11.0' into HEAD