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

Change-Id: Id265410009bce1d9b2210aab39d84abe0eda9067