Use the blk_device supplied by vdc encryptFstab am: 7de5377c89 am: 76c4dfa743

Change-Id: I3a9c811a16ec3e3cb939e24c23b389507e551f95