Merge "vold uses health filesystem HAL" am: fa96af82f3
am: def8ce02b6

Change-Id: I74bcb1519d1bc2d62bdf018a9ed7068c6dfdfbfe