Merge "Add Java equal and toString annotations."