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

Change-Id: I9bd88a090617a9570197e7e7416cbfe2f86444d1