m7-common: ensure /data, /cache are formatted

Change-Id: I1755bcb0f23d20f8237d3e5cba27068362d49c9c
Merge branch 'cm-10.2' into martincz