Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread