Merge "Add a ModuleMetadata package."
am: 57e6db79f8

Change-Id: Ibf1d45afbbb78cb70fd8a0ac867f2cd222308ef1