Merge "media: correctly return cached size for MediaDataSource"
am: 6ca2cb4991

* commit '6ca2cb499112871fd840597184dc75ba26fdeae8':
  media: correctly return cached size for MediaDataSource