Merge changes I34dbae75,I582afae6 into ics-mr0

* changes:
  Augment CTS test for MediaPlayer.setSurface
  DO NOT MERGE: Add CTS test for MediaPlayer.setSurface() For bug 5088394.