Merge "Fix AnnotatedElement.getDeclaredAnnotation() generic signature" am: bd32321b4f
am: 125a273e8a

Change-Id: Ice4b08c827c8c6f0c89f578283d69685b3621e98