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

Merge commit '1b217b0c6d36b7f6f550f45d2b694b0f154a22b7' into eclair-mr2-plus-aosp

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