Merge "add misc partition to recovery.fstab"