use recovery_variant file/dir convention

Also add JB encryption.

Change-Id: I563284628120c3bc628ecf688cde5b1b7e5d4aa0