Merge "vold uses health filesystem HAL"
am: fa96af82f3

Change-Id: I232955955686a2767d290863278b49f4f99520c5