am 64011e7a: Merge "Make vm-tests-tf use ITestDevice.pushDir" into ics-mr0

* commit '64011e7a0c6eb6945db3730652db792978ebfda0':
  Make vm-tests-tf use ITestDevice.pushDir