Merge "Add volatile/jumbo opcodes" into dalvik-dev