am d1588bba: Merge change 21833 into eclair

Merge commit 'd1588bba601a319e6b6b99e797686b203822e8a6'

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