Android : Switch back to aosp mockito

Reason : Breaks building of cts

Change-Id: I948363b15075ec58aceceff78ebe4ea72fc9487f
Merge CyanogenMod/cm-11.0 into cm-11.0

Change-Id: I3a6dc368d0e84d457bed8729c775d1050cbcbe6c