Merge "buildbot: Blacklist repeated annotations test failure for javac/dx" am: 96e3dd546c
am: fd5e830d88

Change-Id: Id2a56fc833a425b10cbc407cc42ffe3ef5ea5df2