merge fstabs for deb

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

Bug: 8766487
Change-Id: I103c4994ce4b68a4d2040db1e1a728467d447202
3 files changed