Merge "Fix StagefrightMetadataRetriever calling MediaSource::start twice" into nyc-dev
am: f56a02a5e7

* commit 'f56a02a5e7d1bfaeabf8b918e56bf49ea509bd42':
  Fix StagefrightMetadataRetriever calling MediaSource::start twice