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

Change-Id: I9fb11c9bb648c571406dea8bf628bde422b585df