Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev