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

Change-Id: I9e5db0fe14e7701b20c27e0c2074fb23496f59aa