Revert "Add a delimiter between scheme and host"
Revert "Add a delimiter between scheme and host"

This reverts commit e990e359f99a9e791106d4eefa046bdff8e22e6d

Change-Id: I2007f04295a5d3b24e281c5823b144ab2782adb7

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base