Merge "Convert external/mockito to Android.bp"
am: 456d2927a6

Change-Id: I556e70dba6a84145551a34894daf68f2549a3d36