Merge "More prep work for new opcodes." into dalvik-dev