Revert "Upgrade python/mock to 4.0.2" am: 3381fde741

Change-Id: I3b6bdb23c93e4227a65d4592eb424a956a36e584