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

Change-Id: Icf701e8675c8d50f81e3a8f0d0de5716c25696ef