Merge "Make artQuickResolutionTrampoline fix up references after GC points." into dalvik-dev