Merge "system/vold: cleanup compiler warnings (read of uninitialized memory)." am: cda5cec39f
am: e9e23bf019

Change-Id: Ic4e45522f591c296f6975f288c5dccd059b00314