[automerger skipped] Merge "Rename ApexInfo.package{Name,Path} to module{Name,Path}" into stage-aosp-master am: 6a36ad8b7e am: 0ad641f9f6
am: 689e587f1c -s ours
am skip reason: change_id If0bd3d368c7373ab0028211a8a4246a9821893af with SHA1 ec67395d7d is in history

Change-Id: If39da98b4c8eb0f5dd87aa825757c70d63a85234