am 9463360f: Merge "Revert "Move tests from tests/api to harmony-tests.""

* commit '9463360f6ab373a67058e3f9af188f788f62cd5a':
  Revert "Move tests from tests/api to harmony-tests."