Merge "Adjust cts-tradefed to JUnit4 test listener changes" into lmp-dev