Merge "Fix missing class initialization during instrumentation." into dalvik-dev