Merge \"Add mockito-target-minus-junit4.\"
am: 8ce36c099e

Change-Id: I2cd84744279b197a15ebddab9e4c5b8f7129b5cb