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

Change-Id: If29abc839cb196072cccc7024b499ef5d54a0f45