Merge "Add --instrumentation-arg to installed instrumentations."