Merge "Dalvik opcode-related fixes."