am f703f68e: am 3002bb4e: Merge "Fix AnimationTest#testSetAnimationListener" into jb-dev

* commit 'f703f68ed53649e70b2fecd66d8fbb4c70923557':
  Fix AnimationTest#testSetAnimationListener