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

Change-Id: I86b264b7c44775e4f2fcdc249d433c363f93961b