Android : Switch back to aosp mockito

Reason : Breaks building of cts

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

Conflicts:
	default.xml