am f4903173: am 34ce73a9: Merge "Revert "Fix instrumentation frame check with inlining""

* commit 'f49031733a6441975ed82b90ce0535209231e9ea':
  Revert "Fix instrumentation frame check with inlining"