Merge changes from topic "revert-1607393-test.java.util.concurrent.tck-XSSJZWQZEL"

* changes:
  Revert "Import java.util.concurrent.tck tests from 9+181"
  Revert "Android patch: Modify test.java.util.concurrent.tck test..."