Merge changes I0e5f6d04,Ib7ce6740

* changes:
  test: Fix 1934-jvmti-signal-thread flake on --jvm
  run-test: Build against libcore for Android device and host targets.