Merge \"Refactored a few dexdump alloc/free into unique_ptr\"
am: bcdc888a39

Change-Id: Ic18afd294dca850e2fadf338141edc888828d8bd