am 49dd24c2: am 1dc1fb4a: Merge "vold: suppress unused argument warning messages"

* commit '49dd24c238e86c57e97f919af7fbf8ee3d79b737':
  vold: suppress unused argument warning messages