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

Change-Id: I521bf059f931d0bdea12cc264d9573ca9b84266e