Merge "Merge "Silence a compiler warning about an unused variable in `hprof-conv`." am: 5a81c499a5 am: f95cfdb1df" into main-plus-java-next-dev