Merge "Remove pre-5.5 compat from MultiHttpClient"