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

Change-Id: I0493425398506c29c364965eb20e45cdaa1f9f1f