am 87333215: am f3f62f26: Merge "Update instrumentation stubs on resolved classes"

* commit '87333215b99b85769f253109b71c6cafd1d49cc1':
  Update instrumentation stubs on resolved classes