am 40d755c2: am f22b3ecc: Merge "Additional refactoring of MediaPlayer tests." into gingerbread

* commit '40d755c2c49c328a64a1bdada8a609a825dabd94':
  Additional refactoring of MediaPlayer tests.