Misc Dalvik fixes
Merge branch 'jb-mr1' of https://github.com/tjarnold/dalvik into jb-mr1

Conflicts:
	libdex/OptInvocation.cpp~