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

Change-Id: I034b1841d83fc8c4a303b59a52092b37ef8f47fe