Merge "[vold] expose binder headers to dependent modules"