27b3eaf4de
Merge commit '0f5179c7d333ddab729b5943766637c21d1b74db' * commit '0f5179c7d333ddab729b5943766637c21d1b74db': Update MediaPlayer to allow setVideoSurface calls after prepare. Also allow