Revert "Change the branch for mockito repo"

This reverts commit 443e0d3a3f7a537a35de01c409261f4658d80c12.

Change-Id: I548e182df7dd8a681712a55d1e6820b8f075dc4e
Revert "Track CM's mockito repo"

This reverts commit 71df86befee6f017657730fd0684102bcb822195.

Change-Id: Id954002e9ae2627ef0a6c7abbfd94138507283d7
Merge PAC-man/pac-4.4 into pac-4.4

Change-Id: I7d6882613f595900aede880b254d33ce95602c0c