Merge "MediaPlayer2: address API council comments"