Merge "Remove stream type from AudioSystem::getRenderPosition()"