Merge change 1015 into donut

* changes:
  Make the simulator handle paths like '//data/data/...' the same way the device does.