Merge "Revert "Added mockito-extended support to WmTests.""