Merge "Use vold's mount with metadata encryption service." am: 4819edf4fc am: fcc1db2189
am: 2c90b91203

Change-Id: I545e40be18e2e2aca925dd3423e9b0dd5136f658