Merge "Run all mocking tests when mockito is changed"
am: 51248b0ba7

Change-Id: I6ff90af98566394cdd252817d19c2829a8d042d7