Build : Update mockito reference to fork

Change-Id: I4483b3c1c64daedb36f38700d9706f995dc3d359
build: reference default branches for mockito

Change-Id: I1c2eea9d017e4c01ba9c797589a9f9c37d3cd7ba
Android : Switch back to aosp mockito

Reason : Breaks building of cts

Change-Id: I948363b15075ec58aceceff78ebe4ea72fc9487f
Merge branch 'cm-11.0' into stable/cm-11.0
Merge remote-tracking branch 'cm/stable/cm-11.0' into cm-11.0-tonyp