Merge "Include OrgApacheHttpLegacyUpdater unconditionally" am: 87c1081c42
am: 34269e4b74

Change-Id: I19a0c5d9d9a2c2c0e5cf482a5a574f304a8ce765