Merge "Fix warning in system/vold/tests."