Merge "Move private_manifest file insertion to jars merging phase."