tree adf115ce5ba1cd53c8a3c3a54b0ec1058aeb293e
parent 29db57e6bfc80519cb90ad7ae22ffef029805abc
author Danesh M <daneshm90@gmail.com> 1413506469 -0700
committer Danesh M <daneshm90@gmail.com> 1413506469 -0700

Android : Switch back to aosp mockito

Reason : Breaks building of cts

Change-Id: I948363b15075ec58aceceff78ebe4ea72fc9487f