Fix dual build: switch to EasyMock + fix NPE

Cannot get dual build to work with mockito -- switch to EasyMock.

Discovered NullPointerException while testing change -- fixed.

Change-Id: I1fc9da05b83258e9761e8e348c9e17e53aa57788
5 files changed