am 353b45f8: Merge "vold: fix warnings for 64-bit"

* commit '353b45f84fa0bde76c91d338f843ff27c6f646ad':
  vold: fix warnings for 64-bit