Merge "Drop support for Android HTTP stack"