am c2d80e96: am 90b4e80e: Merge "Update path to telephonytests directory."

* commit 'c2d80e96922c9cad7831c6c951f7be949faf37f9':
  Update path to telephonytests directory.