am 96e59eb8: Merge "Support for multiple tests" into gingerbread

Merge commit '96e59eb8f34e999deb9eb4974cbfc07c71df3cab' into gingerbread-plus-aosp

* commit '96e59eb8f34e999deb9eb4974cbfc07c71df3cab':
  Support for multiple tests