merge fstabs for flo

The recovery.fstab is missing the encryption metadata information for
the data partition.

Bug: 8766487
Change-Id: I8c0d26d3b532c9b5066996c4a3eaa07d2f4e47a5
3 files changed