Merge "Silence a compiler warning about an unused variable in `hprof-conv`." am: 5a81c499a5 am: f95cfdb1df Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2101215 Change-Id: Ifb5c56c7a73239436634ff3737a8ded0062d6285 Signed-off-by: Automerger Merge Worker <[email protected]>