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

Change-Id: Ida80b4ef12a7fcccadd219c7a7a4151a6f1b6098