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

Change-Id: I2d223f85f22929ed531d6fabb86cfbe2727aa71b