Merge "Optionally have SurfaceMediaSource return absolute timestamps" into jb-mr1-dev