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