47e5968df4
hacking 3.1.x is quite old. Bump it to the current latest version. Also remove the 3rd party mock module as suggested by newer hacking. Change-Id: I5e8115cd640fa438cf2d69020e64257a14ed5243