Fix build

Bring up to date with lastest gerrit.  Fixed the following failures:

* TypeError: java_test() got an unexpected keyword argument 'source_under_test'
* MockingTestCase.java:161: error: cannot find symbol
    return EasyMock.newCapture();

Change-Id: I9e6ed547223a2a5946734584aee5861c2f3d5f6e