am bd4d3203: Merge "Support an ABI flag for instrumentation."

* commit 'bd4d320344833ce67dad3a4e10a61d0502a81d0e':
  Support an ABI flag for instrumentation.