Merge "Apache-HTTP: Suppress MissingOverride warnings" am: 15e2005106 am: fc79906645
am: 55cd34a3c0

Change-Id: Iad10f400e621aeeb659b98ad997a064161dd2da1