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

* commit '099b20f3ce42a49ba49a1a70a818047ea59612ad':
  vold: wildcard support for device path matching