8766538846
The bug caused some classes to be missed when computing the dependencies
of the existing classes.
This change includes the new mock_android.jar compiled from the mock
sources again.
Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
(cherry-picked from 6136af326e)