Merge commit '8232105e' into gingerbread-plus-aosp * commit '8232105e': Properly deprecate HttpRequestHandlerRegistry#matchUriRequestPattern.