am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run...
am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev
* commit '6a3faf5a':
Fix test framework to allow Mockito tests to run successfully on ART.