Android : Switch back to aosp mockito

Reason : Breaks building of cts

Change-Id: I948363b15075ec58aceceff78ebe4ea72fc9487f
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android.git into 'cm-11.0'