am e985c9ab: am 1d8e3ce8: Merge "vold: fix errors inside ALOGV"

* commit 'e985c9ab10fed452b97138170b4d69288d076b06':
  vold: fix errors inside ALOGV