am 2d8c70fa: am dcee3373: Merge "Fix opcode tests for sget_*" into froyo

* commit '2d8c70fa68bec265d332002fd2d2e88d117c5015':
  Fix opcode tests for sget_*