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

Change-Id: I9a9bd41e379bc2f828f3868f40108b170668c26f