Merge changes I9dc35703,I7c4aea4e into main

* changes:
  When globalInitOnce() fails, don't run any tests
  Switch back to Java android.util.Log