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

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