Merge "Add support for native library paths with instrumentation"