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

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

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