Merge "One more format and our first set of wide opcodes." into dalvik-dev