Merge "vold: const-ify some of the API"