* commit 'f35c305f45db60394c3c7fec2e41b38963da70ca': Fix test framework to allow Mockito tests to run successfully on ART.