Merge "Replace jumbo opcodes in certain circumstances" into dalvik-dev