Merge "do not send traffic to localhost through proxy for android" into m39