Merge "Reland allowing MockitoAnnotations.* as static import."