Merge "PackageManager no longer requires the ExtServices to be a "Shared Library""