am 2566990f: resolved conflicts for merge of c62fc717 to master

Merge commit '2566990f30f31c6e2bbcbabab26b925e5504ce37' into dalvik-dev

* commit '2566990f30f31c6e2bbcbabab26b925e5504ce37':
  JIT: Fix for 2813841, use core regs for sub-word data