am 29459d53: am a3ac4d4c: Merge "Perform write barrier on declaring class when adding instrumentation"

* commit '29459d53f9475778a5aa27c943022aad1978696e':
  Perform write barrier on declaring class when adding instrumentation