Merge "Simplify ApexInfo classpath info"