Bacon: Relocate disk encryption metadata

aka: Revert "Revert "bacon: Relocate disk encryption metadata""
This reverts commit 41094c8a4fab6b41af284b830d3e83bfb031c768.

Change-Id: Ib1628d9004a20a6bb84e8874658449fbbb6606d7
Merge "Bacon: Relocate disk encryption metadata" into kk