am 3d9b98cc: am 1dc1fb4a: Merge "vold: suppress unused argument warning messages"

* commit '3d9b98cc833dc7c07da6bb0cc27926c68b63c276':