Merge "Fixes to instrumentation and quick to interpreter entry." into dalvik-dev