Update for android-annotation-2.0.0