am 0f7347dc: Merge "Remove Broken MediaControllerTests" into gingerbread

* commit '0f7347dcc5fc5c5094afccaf7141d921d742c474':
  Remove Broken MediaControllerTests