Revert "bacon: Relocate disk encryption metadata"

This reverts commit 4124e2327cd7faf551f6160b3ebb85221fe5626c.

Change-Id: Ifbf97b45bf4a42b38db9b9a25345c0dd2d4bde18
Signed-off-by: MURA Stefano [STELIX PippoX3] <ssspinni@gmail.com>