Merge commit 'edd8b732' into dalvik-dev * commit 'edd8b732': Properly deprecate HttpRequestHandlerRegistry#matchUriRequestPattern.