Merge "Fix google-explicit-constructor warnings in system/vold."
am: a3bcf26d93

Change-Id: I109b4e68954de019827eddca2001f4bcac91130d