Merge "Vold: remove unused define"
am: 7ac97f8e37

Change-Id: I617533e47e28a8081f7a2f477bda0c44fb3ea992