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

Change-Id: I003e3707f87495081c1f4621f80cdefd8194f2ba