Merge changes I347037eb,Iaeb79aeb

* changes:
  Make PrettyMethod note when a method is obsolete
  Adjust instrumentation CHECK to be correct WRT obsolete methods