Merge "Rename ApexInfo.package{Name,Path} to module{Name,Path}"