am bbc255ef: am a6686ad8: Merge "Fix opcode tests for sput_short" into froyo

* commit 'bbc255ef9155074744474e6a2802a68feeb5ce03':
  Fix opcode tests for sput_short