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

Change-Id: I2bbde4166977723d5fde93d844d41bc244ccbb3d