[automerger skipped] Use the blk_device supplied by vdc encryptFstab am: 7de5377c89 -s ours
am skip reason: Change-Id I279f087b1b7aded40c5a62281154851ce970ba70 with SHA-1 48aa90cd6b is in history

Change-Id: I9eb2f1872efa09a914d77404e4ae675cc106f59d