Merge "Silence a compiler warning about an unused variable in `hprof-conv`." am: 5a81c499a5

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2101215

Change-Id: Ice9539df336b5ba05fff1269fe66c5b379420579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>