Merge "Add force_encrypt flag to fstab to force encryption on appropriate devices"