vold: fix build.

Change-Id: If19cb8ccdbb8466e92480136b0d2a14d59847a2e
Merge remote-tracking branch 'cm/cm-12.0' into HEAD