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

Change-Id: I931c18e7ab953788dba8ae042e5672f588f92e82