Merge "Vold: remove unused define"