Merge "Rename ApexInfo.package{Name,Path} to module{Name,Path}" into stage-aosp-master am: 6a36ad8b7e
am: 0ad641f9f6

Change-Id: I895d342e2101fe14a905c8f600e5cf290ee27b40