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

Change-Id: Id29c69a9a342e9206af93072f7074f841d8b872d