Merge "Skip instrumenting non-class files"