Merge "Make runtest handle inner instrumentation class names."