Merge "ART: Simplify operands in InstructionBuilder"
am: 1c515f0b9d

Change-Id: Ifd600763516f45a0103f72aa2e1538801dd71d16