Android O MR1 IOT Release 1.0.4 (4973263)
Merge "Revert "Revert "Update mockito on AOSP to same version as on internal master"""