Merge "Reduce the scope of a ScopedObjectAccess in dex2oat." into dalvik-dev