am 7c438472: Merge "Cleaning up files from host after test is done." into honeycomb

* commit '7c4384726fe2067a44559c06f5dda959d0be96e5':
  Cleaning up files from host after test is done.