Fix Mockito path

Change-Id: Ia307dedc4b9871e63822789608b536fcf4ca7926
Get rid of the athome libusb variety

We don't need it (for now?) and it's conflicting with the one we
do use

Change-Id: I1658be17e9629b2a388f50400925ddbb0d8420db
Merge remote-tracking branch 'upstream/cm-10.2' into HEAD