Merge "Revert "Revert "Support SBOM generation of m build unbundled APEXs.""" into udc-dev