Merge change 26893 into eclair

* changes:
  Make archquery use the same VM as DDMS/Traceview