am a5de1924: Merge "Further cleanup using dex_instruction_utils.h."

* commit 'a5de1924ddf0e6e89d98484a3b93b63b126bac76':
  Further cleanup using dex_instruction_utils.h.