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

Change-Id: Ib391bcc98f072200418c9827b848ed718f7a9148