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