Merge "A little opcode cleanup in dalvik.system." into dalvik-dev