am 1881395b: am c6752b06: Merge "vold: wildcard support for device path matching"

* commit '1881395b696017dfb40a01e718cc8dc2ea7a38e9':
  vold: wildcard support for device path matching