Merge "Fix monitor verification." into dalvik-dev