Removed the internal HTTP server connector from the Android edition.
Formatted code.
Fixed wrong character in build files.
Merge remote-tracking branch 'upstream/2.2' into 2.2