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

* commit 'f22b3eccc6ec1e730a41aaf1f96a455cea5e6eb2':
  Additional refactoring of MediaPlayer tests.