Merge "Include OrgApacheHttpLegacyUpdater unconditionally"