am 674060f0: Update to support host use of mockito.

* commit '674060f01e9090cd21b3c5656cc3204912ad17a6':
  Update to support host use of mockito.