Merge "Inching closer to having extended opcodes in the vm." into dalvik-dev