Merge pull request #1 from CyanogenMod/cm-11.0

Android : Switch back to aosp mockito