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

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