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

Change-Id: I3c0356b2163d48d2e74373454d74052ab9046e6b