Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"