Specify that we use new recovery.fstab format

Change-Id: I7aa61715458b2bf80aaf4a84839e85249e215e21
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2