am eaa8432d: am 1b217b0c: system: vold: Conditionalize build (default on)

Merge commit 'eaa8432d3f5495f19a06836501d7538211529d98'

* commit 'eaa8432d3f5495f19a06836501d7538211529d98':
  system: vold: Conditionalize build (default on)