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

Change-Id: I7967532a151eb373b878e7723e73df67cce1061f