Merge "dexdump: fix a static analyzer complaint" am: 85c3817a5d am: 89ede0d38e
am: ab59130308

Change-Id: I867816909461b8504ca3685fae434eceedd2b0c2