Merge "Use the blk_device supplied by vdc encryptFstab" am: 3b3a13a81a am: eeb005eb7d

Change-Id: I830e0e44c0d54d5b89e1dab0ab51192261746556