Merge "pm: Require manifest.json for .dm (dex-metadata) files."