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

* commit '598fdf7abe087a3f45b5ab0c932ad339b2e5bb4a':