Merge change 21833 into eclair

* changes:
  Fixing Unsafe.getUnsafe() to look up the stack the correct number of frames.