Merge "dexdump: fix a static analyzer complaint" am: 85c3817a am: 89ede0d3 am: ab591303 am: 4539cd7e am: 583fbe2f Change-Id: I9caa7321cb4fc3b0b274c9b41566c524b5735d4f