Fork system/vold for GCC 4.8 fixes.