Merge "Trim down mediaextractor rules"