Merge "mediaplayer: move MediaClock from NuPlayer to libstagefright."