Merge "Fixes to instrumentation for debug build and interpreter." into dalvik-dev