Merge "Rename ApexInfo.package{Name,Path} to module{Name,Path}" into stage-aosp-master