Merge "To support uri started with http:// in some Java APIs Fix for bug 4016388." into honeycomb-mr1