Merge "Further cleanup using dex_instruction_utils.h."