Merge "ART: Throw InternalError rather than VirtualMachineError"
am: 35b6546b0a

Change-Id: If47458401fee76b66090366f5e47b57fa4d0c4cc