am 8f9fe5a6: am 89792b9c: Merge "Fix instrumentation frame check with inlining"

* commit '8f9fe5a6b1ebe41bc5dcc845dc4be0bda9e57249':
  Fix instrumentation frame check with inlining