Merge "Include OrgApacheHttpLegacyUpdater unconditionally"
am: 87c1081c42

Change-Id: I724fa0b8b997aa58ce444aa8a929f47af665abed