Merge "Move .annotated.java files into an 'sdk' subdirectory."