Merge "Fix warning in system/vold/tests."
am: b96ed7e6e0

Change-Id: I0d8dbf26cd9769307adc0a1ce0d4d02a8bff9382