am 3821e74c: Merge "Adjust cts-tradefed to JUnit4 test listener changes" into lmp-dev

* commit '3821e74c3f9c5df9fa0896642a12d8d63b2d38af':
  Adjust cts-tradefed to JUnit4 test listener changes