Merge "ART: Forward-declare Instrumentation" am: 1aa5232a02
am: 44f9eb5c09

Change-Id: I721c0475246ae9af32c39445f54657d83c7f11cf