Merge changes I985ef753,I2a5abc5d into androidx-main

* changes:
  Update to JDK build 25+-14592233
  Update the update.sh to also fetch darwin arm64