am 643f400d: am 118b75ff: Merge "Use a consistent package path for harmony tests."

* commit '643f400d45af3ea66a5481c20be33dc09c457999':
  Use a consistent package path for harmony tests.